(with-temp-message): Use %s so % in old msg won't fool us.

diff --git a/lisp/subr.el b/lisp/subr.el
index 8954dff55e3d05268a1e7fee3cc2522a4d23906c..738b8994c3f9866fde051a9b8c0424a415ddf8c4 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -976,8 +976,8 @@ Use a MESSAGE of \"\" to temporarily clear the echo area."
               (setq ,current-message (current-message))
               (message ,temp-message))
             ,@body)
-        (when ,temp-message
-          (message ,current-message))))))
+        (and ,temp-message ,current-message
+             (message "%s" ,current-message))))))
 
 (defmacro with-temp-buffer (&rest body)
   "Create a temporary buffer, and evaluate BODY there like `progn'.